Merge "API: Fix using the same module as generator and prop"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 5 Feb 2013 20:38:32 +0000 (20:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 5 Feb 2013 20:38:32 +0000 (20:38 +0000)

Trivial merge